Ensure the icon_theme->all_icons and dir->icons hash tables use the same

2007-04-24  Chris Wilson  <chris@chris-wilson.co.uk>

    * gtk/gtkicontheme.c (scan_directory): Ensure the
    icon_theme->all_icons and dir->icons hash tables use the same string
    as their keys. (#418531)

svn path=/trunk/; revision=17626

diff --git a/ChangeLog b/ChangeLog
index 71ba00b1e39bd7acf6b649cafe29c27a03ec2d20..6fe22887626faff1cdb0fcb1a314f86fc7577f6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-24  Chris Wilson  <chris@chris-wilson.co.uk>
+
+       * gtk/gtkicontheme.c (scan_directory): Ensure the 
+       icon_theme->all_icons and dir->icons hash tables use the same string
+       as their keys. (#418531)
+
 2007-04-23  Cody Russell  <bratsche@gnome.org>
        * modules/engines/ms-windows/msw_style.c: Fixed one-pixel drawing error on
        left-most tab when notebooks are top-oriented.  Also general cleanup of

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 6eb4aa01abfcaddafe6d259af63449c1b336b4cb..2aaa445dc83ee3cf8a85b2768dcf295ee11f294d 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2320,7 +2320,7 @@ scan_directory (GtkIconThemePrivate *icon_theme,
       base_name = strip_suffix (name);
 
       hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_name));
-      g_hash_table_insert (icon_theme->all_icons, base_name, NULL);
+      g_hash_table_replace (icon_theme->all_icons, base_name, NULL);
       g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix));
     }